From: Alex Kiernan Date: Sat, 30 Jun 2018 17:03:51 +0000 (+0000) Subject: boot: Use emergency.target, not emergency.service X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~21^2~21 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a0527e70866bbb29f98e72b3e697f886b3aa8393;p=ostree.git boot: Use emergency.target, not emergency.service Follow systemd units in using emergency.target, not emergency.service (which is the sole unit, by default, in emergency.target) so we can easily reconfigure the units which are actived when entering emergency mode. Signed-off-by: Alex Kiernan Closes: #1665 Approved by: cgwalters --- diff --git a/src/boot/ostree-prepare-root.service b/src/boot/ostree-prepare-root.service index e0659d10..52cf8863 100644 --- a/src/boot/ostree-prepare-root.service +++ b/src/boot/ostree-prepare-root.service @@ -20,7 +20,7 @@ Description=OSTree Prepare OS/ DefaultDependencies=no ConditionKernelCommandLine=ostree ConditionPathExists=/etc/initrd-release -OnFailure=emergency.service +OnFailure=emergency.target After=initrd-switch-root.target Before=initrd-switch-root.service Before=plymouth-switch-root.service diff --git a/src/boot/ostree-remount.service b/src/boot/ostree-remount.service index 8439b495..68209f96 100644 --- a/src/boot/ostree-remount.service +++ b/src/boot/ostree-remount.service @@ -19,7 +19,7 @@ Description=OSTree Remount OS/ bind mounts DefaultDependencies=no ConditionKernelCommandLine=ostree -OnFailure=emergency.service +OnFailure=emergency.target Conflicts=umount.target After=-.mount After=systemd-remount-fs.service